Merge branch 'master' of https://github.com/gpsbabel/gpsbabel
authorRobert Lipe <robertlipe@gpsbabel.org>
Wed, 6 Jan 2016 22:05:19 +0000 (16:05 -0600)
committerRobert Lipe <robertlipe@gpsbabel.org>
Wed, 6 Jan 2016 22:05:19 +0000 (16:05 -0600)

Trivial merge